Bump version. Roll back non-working https changes. Deal with annoying Windows issues...

diff --git a/GPSBabel.pro b/GPSBabel.pro
index 4b8e378a14c80ce95c9c8d6a50ee2f004e337c78..4abab8d3b7035f16f12d0c2832fae672c165faae 100644 (file)
--- a/GPSBabel.pro
+++ b/GPSBabel.pro
@@ -3,6 +3,7 @@ QT -= gui
 TARGET = GPSBabel
 CONFIG += console
 CONFIG -= app_bundle
+CONFIG += c++11
 
 TEMPLATE = app
 
@@ -29,7 +30,7 @@ ALL_FMTS=$$MINIMAL_FMTS gtm.cc gpsutil.cc pcx.cc \
         vpl.cc teletype.cc jogmap.cc bushnell.cc bushnell_trl.cc wintec_tes.cc \
         subrip.cc garmin_xt.cc garmin_fit.cc lowranceusr4.cc \
         mtk_locus.cc googledir.cc mapbar_track.cc mapfactor.cc f90g_track.cc \
-        energympro.cc mynav.cc ggv_bin.cc globalsat_sport.cc
+        energympro.cc mynav.cc ggv_bin.cc globalsat_sport.cc geojson.cc
 
 DEPRECIATED_FMTS=cetus.cc copilot.cc gpspilot.cc magnav.cc psp.cc gcdb.cc quovadis.cc gpilots.cc geoniche.cc palmdoc.cc hsa_ndv.cc coastexp.cc pathaway.cc coto.cc msroute.cc mag_pdb.cc axim_gpb.cc delbin.cc google.cc
 

diff --git a/configure b/configure
index 8567166b266b58d0adb3e5605a321fa46ecada11..36312c6b2cd5f77f508215c9f4086da92622a041 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.3.
+# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.4.
 #
 # Report bugs to <BUG-REPORT-ADDRESS>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GPSBabel'
 PACKAGE_TARNAME='gpsbabel'
-PACKAGE_VERSION='1.5.3'
-PACKAGE_STRING='GPSBabel 1.5.3'
+PACKAGE_VERSION='1.5.4'
+PACKAGE_STRING='GPSBabel 1.5.4'
 PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS'
 PACKAGE_URL=''
 
@@ -1286,7 +1286,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GPSBabel 1.5.3 to adapt to many kinds of systems.
+\`configure' configures GPSBabel 1.5.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1352,7 +1352,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GPSBabel 1.5.3:";;
+     short | recursive ) echo "Configuration of GPSBabel 1.5.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1452,7 +1452,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GPSBabel configure 1.5.3
+GPSBabel configure 1.5.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1859,7 +1859,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GPSBabel $as_me 1.5.3, which was
+It was created by GPSBabel $as_me 1.5.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2207,7 +2207,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-DOCVERSION=1.5.3
+DOCVERSION=1.5.4
 
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
 #DOCVERSION=development
@@ -6013,7 +6013,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GPSBabel $as_me 1.5.3, which was
+This file was extended by GPSBabel $as_me 1.5.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6075,7 +6075,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GPSBabel config.status 1.5.3
+GPSBabel config.status 1.5.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.in b/configure.in
index 616557fce476cd338deafc11f34207b074d91467..ffa67430c1341018955d5bef0aff37d9a2a5b4ad 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,8 +4,8 @@
 AC_PREREQ(2.59)
 
 #PACKAGE_RELEASE=
-AC_INIT(GPSBabel, 1.5.3, BUG-REPORT-ADDRESS)
-DOCVERSION=1.5.3
+AC_INIT(GPSBabel, 1.5.4, BUG-REPORT-ADDRESS)
+DOCVERSION=1.5.4
 
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
 #DOCVERSION=development

diff --git a/gbversion.h b/gbversion.h
index c5ad1225e3713c6866a19062ea188ecc2940475d..e8845b21c9b463aca93ae639e9941e1eb1e2c21b 100644 (file)
--- a/gbversion.h
+++ b/gbversion.h
@@ -4,5 +4,5 @@
  *
  * Isn't simplification via automation grand?
  */
-#define VERSION "1.5.3"
-#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.5.3"
+#define VERSION "1.5.4"
+#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.5.4"

diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index a649e3e795cd5ac9eaa35816422a644967731529..a21ad9591de805984fbd9017b71c5c38513b4fff 100644 (file)
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -1029,7 +1029,7 @@ void MainWindow::closeActionX()
 
   QDateTime now = QDateTime::currentDateTime();
   if ((babelData_.runCount_ == 1) ||
-      (babelData_.runCount_ > 5) && (babelData_.donateSplashed_.daysTo(now) > 30)) {
+      ((babelData_.runCount_ > 5) && (babelData_.donateSplashed_.daysTo(now) > 30))) {
     Donate donate(0);
     if (babelData_.donateSplashed_.date() == QDate(2010,1,1))
       donate.showNever(false);

diff --git a/gui/setup.iss b/gui/setup.iss
index 71020947a282186f82eee4a730ba50b8afa99bf1..b60c3b00d4a81460fdf1ae537e39b29d7664bd54 100644 (file)
--- a/gui/setup.iss
+++ b/gui/setup.iss
@@ -16,7 +16,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)\r
 AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017}\r
 AppName=GPSBabel\r
-AppVerName=GPSBabel 1.5.3\r
+AppVerName=GPSBabel 1.5.4\r
 AppPublisher=GPSBabel\r
 AppPublisherURL=http://www.gpsbabel.org\r
 AppSupportURL=http://www.gpsbabel.org\r
@@ -24,7 +24,7 @@ AppUpdatesURL=http://www.gpsbabel.org
 DefaultDirName={pf}\GPSBabel\r
 DefaultGroupName=GPSBabel\r
 OutputDir=release\r
-OutputBaseFilename=GPSBabel-1.5.3-Setup\r
+OutputBaseFilename=GPSBabel-1.5.4-Setup\r
 SetupIconFile=images\babel2.ico\r
 Compression=lzma\r
 SolidCompression=yes\r

diff --git a/gui/upgrade.cc b/gui/upgrade.cc
index 08d70d8b13876f8d7979dbe09899787d955d250b..449edf2f0a473a01a3e874aaaef06056086e20a8 100644 (file)
--- a/gui/upgrade.cc
+++ b/gui/upgrade.cc
@@ -57,7 +57,7 @@ UpgradeCheck::UpgradeCheck(QWidget *parent, QList<Format> &formatList,
   QObject(parent),
   manager_(0), 
   replyId_(0),
-  upgradeUrl_(QUrl("https://www.gpsbabel.org/upgrade_check.html")),
+  upgradeUrl_(QUrl("http://www.gpsbabel.org/upgrade_check.html")),
   formatList_(formatList), 
   updateStatus_(updateUnknown),
   babelData_(bd)
@@ -134,7 +134,7 @@ QString UpgradeCheck::getOsVersion()
   case QSysInfo::WV_6_1: return "7"; break;
   case QSysInfo::WV_6_2: return "8"; break;
   case QSysInfo::WV_6_3: return "8.1"; break;
-  case QSysInfo::WV_10_0: return "10"; break;
+//  case QSysInfo::WV_10_0: return "10"; break;
   default:
        if (QSysInfo::WindowsVersion == 0x00a0) return "8";
        if (QSysInfo::WindowsVersion == 0x00b0) return "8.1";
@@ -212,7 +212,6 @@ UpgradeCheck::updateStatus UpgradeCheck::checkForUpgrade(
   }
 
   replyId_ = manager_->post(request, args.toUtf8());
-  
 
   return UpgradeCheck::updateUnknown;
 }
@@ -314,7 +313,7 @@ void UpgradeCheck::httpRequestFinished(QNetworkReply* reply)
     QDomElement upgrade = upgradeNode.toElement();
     QString updateVersion = upgrade.attribute("version");
     if (upgrade.attribute("downloadURL").isEmpty()) {
-      downloadUrl = "https://www.gpsbabel.org/download.html";
+      downloadUrl = "http://www.gpsbabel.org/download.html";
     } else {
       downloadUrl = upgrade.attribute("downloadURL");
     }

diff --git a/mtk_logger.cc b/mtk_logger.cc
index 29a2680c573aa718734c96e2fe847c9189a733ba..2f94bc4fb1537ef36522f6c8a688becc0372040f 100644 (file)
--- a/mtk_logger.cc
+++ b/mtk_logger.cc
@@ -61,6 +61,11 @@
 #include <errno.h>
 #include <math.h>
 #include <stdlib.h>
+#if __WIN32__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
 
 #define MYNAME "mtk_logger"
 
@@ -765,7 +770,11 @@ mtk_retry:
     }
   }
   if (dout != NULL) {
+#if __WIN32__
+    _chsize(fileno(dout), addr_max);
+#else
     ftruncate(fileno(dout), addr_max);
+#endif
     fclose(dout);
   }
   if (global_opts.verbose_status || (global_opts.debug_level >= 2 && global_opts.debug_level < 5)) {